From 5df4d277527858481ca6eb7af0762c73d804f19d Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 23 Jul 2018 17:19:31 +0530 Subject: [PATCH] meson: libgdk-broadway.a depends on broadwayjs.h Fixes https://gitlab.gnome.org/GNOME/gtk/issues/1218 Also fix another dependency error I found. --- gdk/broadway/meson.build | 24 ++++++++++++------------ gdk/x11/meson.build | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gdk/broadway/meson.build b/gdk/broadway/meson.build index 0306770f3f..590440ace0 100644 --- a/gdk/broadway/meson.build +++ b/gdk/broadway/meson.build @@ -43,8 +43,19 @@ clienthtml_h = custom_target('clienthtml.h', ], ) +broadwayjs_h = custom_target('broadwayjs.h', + input : ['broadway.js'], + output : 'broadwayjs.h', + command : [ + gen_c_array, + '--array-name=broadway_js', + '--output=@OUTPUT@', + '@INPUT0@', + ], +) + libgdk_broadway = static_library('gdk-broadway', - clienthtml_h, + clienthtml_h, broadwayjs_h, gdk_broadway_sources, gdkconfig, gdkenum_h, include_directories: [confinc, gdkinc], c_args: [ @@ -58,17 +69,6 @@ libgdk_broadway = static_library('gdk-broadway', broadwayd_syslib = os_win32 ? find_library('ws2_32') : shmlib -broadwayjs_h = custom_target('broadwayjs.h', - input : ['broadway.js'], - output : 'broadwayjs.h', - command : [ - gen_c_array, - '--array-name=broadway_js', - '--output=@OUTPUT@', - '@INPUT0@', - ], -) - executable('gtk4-broadwayd', clienthtml_h, broadwayjs_h, 'broadwayd.c', 'broadway-server.c', 'broadway-output.c', diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build index 33e61c114a..03d314feef 100644 --- a/gdk/x11/meson.build +++ b/gdk/x11/meson.build @@ -70,7 +70,7 @@ gdk_x11_deps = [ xinerama_dep, ] -libgdk_x11 = static_library('gdk-x11', +libgdk_x11 = static_library('gdk-x11', gdkmarshal_h, gdk_x11_sources, gdkconfig, gdkenum_h, include_directories: [ confinc, gdkinc, ], c_args: [ -- 2.30.2